search: Ignore search provider results metas if search is cancelled

When a search has been cancelled, it is expected that providers don't
return the requested number of results, so don't log a warning in that
case.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205

diff --git a/js/ui/search.js b/js/ui/search.js
index 804be9593902206b1e9c8fc04a0e46f4281ab893..396674107080cdc607f5d6b649d689441dee13a0 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -226,6 +226,12 @@ var SearchResultsBase = new Lang.Class({
             this._cancellable.reset();
 
             this.provider.getResultMetas(metasNeeded, metas => {
+                if (this._cancellable.is_cancelled()) {
+                    if (metas.length > 0)
+                        log(`Search provider ${this.provider.id} returned results after the request was canceled`);
+                    callback(false);
+                    return;
+                }
                 if (metas.length != metasNeeded.length) {
                     log('Wrong number of result metas returned by search provider ' + this.provider.id +
                         ': expected ' + metasNeeded.length + ' but got ' + metas.length);